eb51893dd468d7c69a6e48286dafec2d488b40ce,sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3FibTest.java,SdxL3FibTest,testFibAdd,#,227
Before Change
// Construct a MultiPointToSinglePointIntent intent
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(
fibEntry.prefix());
TrafficTreatment.Builder treatmentBuilder =
DefaultTrafficTreatment.builder();
treatmentBuilder.setEthDst(MacAddress.valueOf(MAC1));
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(CONN_POINT2);
ingressPoints.add(CONN_POINT3);
ingressPoints.add(CONN_POINT4);
MultiPointToSinglePointIntent intent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
.key(Key.of(prefix.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
.egressPoint(CONN_POINT1)
.constraints(SdxL3Fib.CONSTRAINTS)
.build();
// Setup the expected intents
intentSynchronizer.submit(eqExceptId(intent));
replay(intentSynchronizer);
// Send in the UPDATE FibUpdate
FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE, fibEntry);
fibListener.update(Collections.singleton(fibUpdate), Collections.emptyList());
verify(intentSynchronizer);
}
After Change
// Construct a MultiPointToSinglePointIntent intent
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(prefix).matchVlanId(VlanId.ANY);
TrafficTreatment.Builder treatmentBuilder =
DefaultTrafficTreatment.builder();
treatmentBuilder.setEthDst(MacAddress.valueOf(MAC1)).popVlan();
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(CONN_POINT2);
ingressPoints.add(CONN_POINT3);
ingressPoints.add(CONN_POINT4);
MultiPointToSinglePointIntent intent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
.key(Key.of(prefix.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
.egressPoint(CONN_POINT1)
.constraints(SdxL3Fib.CONSTRAINTS)
.build();
// Setup the expected intents
intentSynchronizer.submit(eqExceptId(intent));
replay(intentSynchronizer);
// Send in the added event
routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
verify(intentSynchronizer);
}